Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master
am: f8243e1e99
Change-Id: I67553b5f49940723937cb9b3b84f4a4a9a5af9aa
This commit is contained in:
am: f8243e1e99
Change-Id: I67553b5f49940723937cb9b3b84f4a4a9a5af9aa