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

Change-Id: I7ee3cfd512553bcf5ff3297a7df0db6786d3436a