Merge "Update for providing architecture info" am: 6558c77eb1
am: d5daea0b99

Change-Id: I20aeca4400b55a7ed2dfcfb15757d35c4b2d86c9