Merge stage branch to development trunk.

Bug: 160260413
Merged-In: Ic44b98572611891b4e28c086035bab2d0f2565d7
Change-Id: I4c3e95495f4e4e286e5bfe25de2eb0b53a17c80c