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

Change-Id: Iac7538e61afb8586adfdf7ca15c86675d293d933