Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 0b20a8a314

Change-Id: I0bf11b0736abf14664ee09bbbaef595fb4056343