Merge commit '47d8a54def13c7c9a7a849d614f7f842eb21193b' into HEAD
Change-Id: Iaa6429a35607618e6114311c45284087abb32b79