am 8907fc2a: am 4a5c1e1e: Fix 2209039 and 2220106

Merge commit '8907fc2aa2478ada561fc5cdd0a885633c303289' into eclair-mr2-plus-aosp

* commit '8907fc2aa2478ada561fc5cdd0a885633c303289':
  Fix 2209039 and 2220106