Merge 497a63121b23856c8b9070deb45cf79fe62e2695 on remote branch

Change-Id: I6144127a47e5ee2d1c17b166cad74ab7f5a9b72f