Merge 70cd7aa16ca196239d32fef45e8475ddc8141b8a on remote branch

Change-Id: I56035287ee1fcc79ec80517a354a5393d7eb30f4