Merge commit 'a5ac6b277ce5555d18e628c619f9451b43030680' into HEAD
Change-Id: I2c653208614ba2b7755c4b7bcb611ed6c24ac069