Merge commit '3393a77483b210027d65e09b07502a85943e4681' into HEAD
Change-Id: Ib139ce81b640f94f23175fd06df7c135ebf47b61