Merge commit '336e9228c3be1e876e80332e669419f26ed53c9c' into HEAD

Change-Id: Ie981fc6b7ccac8c2558e77b4b5ef343b197badae