Merge changes from topic 'vintf_arch'
am: 45370128a5

Change-Id: Ia8e62d1a64e5a893b651c46e5872854e2f52034f