Merge "Fix the wrong assignment"
am: cf74daba15

Change-Id: I1ddab12828584676054e57d317600797564b0921