Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 3979022626 am: cb543ebdf7
am: 1777f4936f

Change-Id: I1387385e583ff333ea2d6e19ea7debe9e588840f