am 2ad6067c: (-s ours) do not merge: cherry-picked...
am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d from master branch
Merge commit '2ad6067c' into gingerbread
* commit '2ad6067c':
do not merge: cherry-picked 44db990d from master branch