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

Change-Id: I22668080195cc78f3ee2576f6094eeb524781c96