Merge commit '819c57b440'

Change-Id: I82594526b6f921af058982f450efbdfdad78b106