am dd2f703d: am 2d95a33d: Merge "Fix build. Missed current.txt in previous...
am dd2f703d: am 2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
* commit 'dd2f703d':
Fix build. Missed current.txt in previous checkin.