Merge 5ef970bf24544a7c235c58f8fb62ecf89c69ce27 on remote branch

Change-Id: I7fd3f2a6f86c464c871c0aa3de144c3f403745f4