Merge changes from topic 'vintf_arch' am: 45370128a5
am: c2b36f5696

Change-Id: Id6a10176042b63fcefe8298dae2df4c5ac4c5297