Merge changes I17c68573,Ic9096cf6
am: ce42c93b66

Change-Id: Ic87c6d8e9b50ab6349e62525fd2db0ac9c438dcf