Merge 07df6afecf8e676f5a067aa3c31976ac1ffd02f1 on remote branch

Change-Id: Ib61c904474445bc0b477c4c8b8ea6a08489e6089