Merge changes I0ee130db,I33d356fd
am: e461b37965

Change-Id: I4a2fe8cec7db8db9b6f701dace34d76879b13e7e