Merge d68d7b123c14061dc8efb55f39109e42d63281a5 on remote branch

Change-Id: I1fcc8b7b36182c470ce5467df50758a2bad071ee