Merge remote-tracking branch 'aosp/upstream' into merge am: 40d8c975c7 am: 4cc6c5f58c
am: d251e80778

Change-Id: I8fc4efb7571b3aa03b241ae98355dbd4f3dfd2b3