Merge bbb9b58d78c2bee7d2c706557696121dc66d55fe on remote branch

Change-Id: I800c957d285cda3fb8c869108d43717b1cce5b16