Merge changes I8c2d29be,Ibbc58c3e
am: 831196440e

Change-Id: I076e52cdf6e46f1df055de0bfe9583d72f3fd181