Updating based on review comments, compile tests

Change-Id: I027bb35dfd93718ed20b59a550414395f1352925
Bug: 23343624
6 files changed