Merge 222c57c6ca666578457fe32a4d594f7324c5ddcb on remote branch

Change-Id: I70e094336b481ff416653e8cd11671114f4d23eb