Merge ef67b04e640932b6a556f5399ca93653450f1ee2 on remote branch

Change-Id: I8c9b68d103d22193746a923003196bcb9457fe56