Merge changes I220cb741,I471b2d19 am: 20ebcdca46
am: 106b26a26c

Change-Id: I9dc34a1930f944445d8e8a93fb14ff738e2b8140