am c1d449d0: Fix http://b/2305223 (DO NOT MERGE)

Merge commit 'c1d449d071703d3c2b8c4d9961e812b4632b5c90' into eclair-plus-aosp

* commit 'c1d449d071703d3c2b8c4d9961e812b4632b5c90':
  Fix http://b/2305223 (DO NOT MERGE)