Merge 6a04ee6051d0ffc1790253bf0ab5d721c665553f on remote branch

Change-Id: I50b7ea38601da61600be4af2b8f5977ba02ea1d0