Merge 8e42be5c20ff1240f0182007a0a70dfcd9f0fc9c on remote branch

Change-Id: Iddff16cc441714ccc4cac2843180a9f9f8d18f0c