Merge 49d780346e44aff1324508770e21244f11d8870a on remote branch

Change-Id: Iecd77f67b9baac5e1a303f3b5650a4fc04346a09