Sync from JIRA -> BZ

Change-Id: I4e5a8a741e16d4750e2be35cf488a6fb9acf1fe6