Merge changes I51c462c0,If8674fc7 am: 750cf88c88
am: c40bee3187

Change-Id: I355ad8f539a047c2ac920d88c585c4a3eb6d24ea