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

Change-Id: Ib2f4ade384b33efc5d54374ce13e26e256f4c8d3