Merge changes I06bea24c,I8e2e24af
am: c7cbe12cfd

Change-Id: I4d69c8516ca5f63480fb9a1d04dfe5f795af2b75