Bug: http://b/27189432 Change-Id: Ib80dcce949276ee620f601c47b20f783708e8e85 (cherry picked from commit 0cd10d83e4)
0cd10d83e4
Change-Id: I227676276da1b08a84486f29fb0e1502c8dbdf4a (cherry picked from commit e2b4e1e00c)
e2b4e1e00c