Merge "Change naming to be more specific" am: 24b58ed995 am: 25dfef2df8

Change-Id: I7676b1b79ccd459044d24650e7de526caabd1d7e