Merge "Sync with upstream 95647bc8:" am: 20ad1ebc31
am: 7387ebee3f

Change-Id: Id75af24f37da4f441c708846c0695f710a7de8a5