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

Change-Id: I7f3476aa3ab81311e03ffd2e10e4eb8c541f9949