Merge changes I17d48a60,I90bc4912 am: bfb438a330
am: d88b382c63

Change-Id: Iaac2ba48f8f695dcd9e623dac2f5b827541cdf3a