Merge changes I17d48a60,I90bc4912
am: bfb438a330

Change-Id: I8161ee05a490d3c9523e14129b4c47ddea81949d