Merge a72c7ae3bb0687bd3a7552b2812123c5bedf6cf9 on remote branch

Change-Id: Ib55920c710af840b1089706abf5dcd3901e7b076