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

Change-Id: Ib17fb1e919fdc5a1d3ce652debf1f0d530fde57f