Config changes to support HAP 1.5. Bug ID for this is # 1374204

Change-Id: Ib90459014576cba3e5e48bdd1b1bd2129039a9c4
Merge "Config changes to support HAP 1.5. Bug ID for this is # 1374204" into R1.10