Merge 3998351991edf72dabc50d3b8d01b39653043174 on remote branch

Change-Id: I30cc4aa705f85092e210663d2b1afd81e41b7e3a