Merge 48c754e7c969c04dbf14e8fb8c56f012e1998a65 on remote branch

Change-Id: Iddd8fc3ad5049a0ee0fce7b0599f3e8f13b1bf6a