Merge commit 'd8a8500429' into new

Change-Id: I13e6c1d3a63e298ddebcc83a229fa497dd5eb129