Merge eaa0230bccc68d56c80ba8d27c56fcac3c3cf010 on remote branch

Change-Id: I06b9d62a9255295c292780354ea79d32a502fd32