tree b4459aaafad3a6e46bc08c99e185f5187513c699
parent 279f32ded531319d47c0ee55c606c4d627c62082
author Adam Lesinski <adamlesinski@google.com> 1477697955 -0700
committer Andreas Gampe <agampe@google.com> 1499277332 -0700

Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6

Partial cherry-pick of commit 7ad1110ecd6a840fcd2895c62668828a1ca029c6.

Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d