Merge 4cd67489c06cbeb737221cdad9ff6d4e9b34b9a0 on remote branch

Change-Id: Iea89e5aedf86b84ab346a2a16d8616105e8ba35d