Merge changes I8580973e,Ic4455db1
am: 3a18549725

Change-Id: Ifaa025b984f2f05eb13a8f9aaf913d39182fa8df