Merge 79d96aa5654dca73edbc9f6d8929209da3ce7d55 on remote branch

Change-Id: Id295aff21d99068a1bc08b23f8fb023f34efc963