Merge changes If3664d44,Iab038f3e
am: 69b83f0af0

Change-Id: Ia0ca7dc5bb24fd6a6e795c338a40160b45fcf253