PRSDK-927: added #ifdef check and merge to master
authorIvan Pang <i-pang@ti.com>
Tue, 18 Oct 2016 21:11:28 +0000 (16:11 -0500)
committerIvan Pang <i-pang@ti.com>
Tue, 18 Oct 2016 21:11:28 +0000 (16:11 -0500)
Signed-off-by: Ivan Pang <i-pang@ti.com>

Trivial merge