Merge changes I59bd6ec5,I48864d48,I9b46a4e2,I09a70f3e
am: ba81a4d2a9

Change-Id: I8656226d30cb88df36c911b3da73674ee3d87130