Merge changes from topic "150578172-ns" into sc-dev

* changes:
  [automerge] Specify version for aidl_interface explicitly 2p: 44c15f1ea7
  Specify version for aidl_interface explicitly