Merge changes I207718d6,I700ef52e
am: 125a3a4604

Change-Id: I5be7c2dfe45b63511477af23293bf22ac2aaeff8