M20180329-1005
'var' type Change-Id: Ib9afea4c57dad41caf112bb19b893adf9ab3b657 (cherry picked from commit 02939fd8fa3ed56f2a6305da596d65953b43c222)
'var' type Change-Id: Ib9afea4c57dad41caf112bb19b893adf9ab3b657 (cherry picked from commit 02939fd8fa3ed56f2a6305da596d65953b43c222)