am c450359d: am 1007a8dc: Merge "Fix issue 3022800." into gingerbread

Merge commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290'

* commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290':
  Fix issue 3022800.