Merge commit '864a2b0e25da01885f558bde41e9da73801c790e' into manual_merge_864a2b0e25da01885f558bde41e9da73801c790e

Change-Id: I39f86a02a4d7ccdc3674be61ad96ec9b05fed617
Merged-In: Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2
Test: TH
Bug: 156287389