Merge 5c58ca5696b0bf1e1314a060897fdf6e09e0136c on remote branch

Change-Id: I51f8e3c7eab9190d4c9c5c67146613b7c6248589