Merge commit 'da04130a047de0290bc1b61451028e05e01661ec' into HEAD

Change-Id: Iab47b6412b78797106296f9241915ba944a985b9