Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master am: f8243e1e99 am: 851f42c54f
am: 7c2e1f2652
Change-Id: I17f10934daf774b87b2ec7d6c3638e13b20e3d3b
This commit is contained in: