variables. Bug:29234237 Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085 (cherry picked from commit 0f0f5414)