Merge changes Ib3267cea,Id21c36e4,I069957a6,I18fb381d,I1bc55bc1
am: 111b895dfa

Change-Id: Iabf05eb2ed758e8faafff9189303a17b32663e1c