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

Change-Id: Id85438a83796e1755e8142963f54e1ea75cc0e2c