Merge 16c3949533abc9501cfc7e7fbda10a7a32e3a196 on remote branch

Change-Id: I776bbd5bc0be4a88dbe3b11c7277e1bfd7a5a041