Merge 68bdfaa7386fd71318e674322045da5ea8760ec8 on remote branch

Change-Id: I94dd3ca0458e6411e604870a3d1de5d35ca37ec3