Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605 am: 4a901144fe
am: c9532e8ac6

Change-Id: Ibe7d825b3b491cd9e5fb1ef07adaa9f71719e0dd