Merge branch 'upstream-master' am: fbec2b81da

Change-Id: I967270194f155756fc0cd48e64177f50db0e8aed