Merge changes I9afd9f88,I1cf94699
am: 54b20eb52f

Change-Id: I09581d02cb3ffad069f0a4016c065b660882c247