Merge changes I8e8799fd,I4626262e am: 6f7d6f1bc3
am: faf41c5ce3

Change-Id: If5db6f333b5ae376c4ca2417c17d04de87ee665a