Merge 1e83280395fcd364f55f23b6605e350e6b2ece07 on remote branch

Change-Id: I44643a48ea33c0c9846ce2829212e0ed04570dc6