Merge changes from topic "hiddenapi-dark-grey" am: 3d93d8f323
am: 5c776dea7e

Change-Id: Ia99cb83b2083a0c3f688830f4755df285bd0091b