Merge changes from topic "hal-api-entity"
am: f2d725478c

Change-Id: I07afa1e645d65cbe4736ab0641eef97a3230dbdc