Cherry-pick from master 71be098 Change-Id: I9dc0245fdd19660a4b08d454892df02a02810749
71be098
d2819621