Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5
am: ce7ee088ff

Change-Id: I952d27f5b06753ae424a7e92b9511c95ef0c355b