Merge commit '82e9863f62581d4b8f7acf6911ee07a1acd0f08a' into HEAD
Change-Id: I55c722dae802e856c558efa86a566fa97cdc2564