Merge stage branch to development trunk.

Bug: 160260413
Merged-In: Iaeca9b46eb05073fc497dc29926f04aaf485b396
Change-Id: I49ab232a7999c7c0c2e7fae05d6d5055ae78be3f