Merge changes I03daad97,I7d47b978,I70103fb2
am: 3395da0aee

Change-Id: I515411671c625e98669f85d9eacbbb0001693d48