Merge 37bc164b63dd01b205683c785af866178eff8fa8 on remote branch

Change-Id: I47e28170ecd0e04f0c4bce206fe7655fb940cc59