Merge changes from topic "no_api_level_fixes" am: 85e289af4c am: e421db560e
am: 152bf90019

Change-Id: Ib11c182af764884e11380015cfd35257efae8b48