Merge 3c1b974a and a4f65ce7

Change-Id: I536026aab833367350b595b41911e9888cff2e3a