Merge b23b0f488bfc98786a187caffc774ad752c5b144 on remote branch

Change-Id: Ib54c360e6dbc304ea5395bd7dd6d069cd8e78455