Merge 5b94666d2622f7e8dd58609ca0057250d0fb1b6f on remote branch

Change-Id: Ic5b7bfbe97a14fcb7d256cafc59b077c32daf234