Merge ef70d7acf5862de1e4293818b4f84619d121bb35 on remote branch

Change-Id: I6d138c34e8ac07d379a9683eeea6af4dfa8d43ce