Merge changes I17a608a6,I397a417d,I41b28bb3,I70621604
am: fc97949e85

Change-Id: I1b225e3c4963df0c60513689613bae8a1f512801