Merge commit 'a90673066b477df17509247e118cec5439861a52' into HEAD
Change-Id: Ibd29aa380f3045496bd87359a47674ecb701468a