Fixed the short circuiting expression DO NOT MERGE

Bug:4136579
Change-Id: I65435a5dd214106acf71d3653e810c1fc071af8f
1 file changed