Merge commit '4dad49ab7ebc511178050565feb33fb48fca63ea' into HEAD
Change-Id: Iad9db50d96b09ef46067e849398777f116eb129d