Merge "Change mapping of .ota extension"
am: a5d67e1923

Change-Id: I376c500f8a1e592a783243d46527805a1a89bfc2