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

Change-Id: I1e2446f67e0505d30edb230f2dde70855c9fe00c