Merge 27d5ebe71fbc0c6414de98909c298d71c4dcfb37 on remote branch

Change-Id: Ifd0322e2c9ad14df614a990e725141c88fbd6e3e