Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 22828a210c am: 696c290c39
am: 77e8ee8880

Change-Id: Idf5f02e65692c3ae956a35519fcd8549bbc1543f