Merge changes I026ed49e,I8685b1ae
am: 11cf355c8d

Change-Id: I0f3e0d4a48b04cab5c550a3d0ae7b246055b4344