Merge changes from topic 'aosp-generics-api' am: fe9357f6e7 am: 98f6bbbec8
am: 225e8943b8

Change-Id: I1af36d72e88b2538cb68a214722ebb5c9690fdc3