Merge b933895fe27526e337e6dda735ed2c867fa389f4 on remote branch

Change-Id: I6fa049e721543ff7b4338e5a62fc76f4dc9f9f51