Merge "Merge branch 'dev/dev-kernel-f2fs-bringup' into HEAD" into rel-24
mobile promotions [Thu, 28 Jan 2016 18:34:39 +0000 (10:34 -0800)]

Trivial merge