Merge 7c6f4fcf0faf9d2d0451420388dc35e5402a026e on remote branch

Change-Id: I3056bd7dd4240944af3dcd62a96b8dd333812f2e