Merge stage-aosp-master to aosp-master - DO NOT MERGE am: a99bb6d755

Change-Id: I9bea6eef7fa3caf0c5eb0e40811156d5cb32bb8f