Merge changes I93c26ff3,I0dc1a141
am: 5528d1c7cf

Change-Id: I271749b1cc060136ccb06ced5199861b92243478