Merge remote-tracking branch 'origin/temp_master'
am: 501b16281d

Change-Id: I0dcc505f4107f7089d9d86f025e76f684b12d96b