Merge changes from topic 'aosp-generics-api'
am: fe9357f6e7

Change-Id: Ifff5983e6c85faefa91e8ec5de4221cc715c575c