Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 59522001f5

Change-Id: I21a3bb7b49f10fa9d0e95fad2806d33cad5f7413