Merge changes I5a01d709,I1b7da86d am: 95d9c6164b am: 3e07b3a7f3

Change-Id: If6905874c40756157d5c6aa33db38964c6dd5a6d