Merge changes I91249ba8,Ic93812d9
am: c8cbda6596

Change-Id: Id1f8627e00b38987647525539973b0f51802f549