Merge changes I22e348b4,Iaa253a43 am: dd7bba046d am: d406da0978

Change-Id: Ic536a4ba3f1b039eb21fcc9b4243632d01705549