Changes for MasterAOSP

Change-Id: I767d4789077a6ae29c62fd78d1c090112bce0164