Merge 7940eec884da986b38f11d91ddd782034f9a1a2d on remote branch

Change-Id: I433b36f1e3dc6945c99cb7b1fe406945eb87a9c1