Merge commit '060427d9dda71a0378d306510d9379c7054d7166' into HEAD
Change-Id: Ic70ddcf714241bca4c06c6d3864b921084b9eaa4