Merge a18b8a9063a59b48c965ba75a35c58a722b2a5a4 on remote branch

Change-Id: Iec9a48be026bcc1c106bdf8dd7bbc8b7f2ee3213