Merge 79a9dc7f52937e70640efe08bd9d1aac2a886ad7 on remote branch

Change-Id: I1b53ee692e6e84b919e2154d092e91171b989fb0