Merge d152b5973d2a736f23832ceb2d7d38cf32014292 on remote branch

Change-Id: I3b1c085bc9bc6c2a311e857061d25ff40e1fe2e8