Merge "Fix the wrong assignment" am: cf74daba15 am: f8e84f8434
am: ab9b774cd6

Change-Id: Ia1e996ee23e8fbd6697382881560457d1cfb078e