Merge 37e44cf61070118370d41a06259382d8cb6cddf5 on remote branch

Change-Id: I7dfb46184b7c5a1a100b8f776ff1e7462f3a70f1