Merge "Mitigate Resources leak on API 21+" into mnc-ub-dev
am: 65da5cf

* commit '65da5cf7a21ad9a785cf4959705e1b3716ca5929':
  Mitigate Resources leak on API 21+

Change-Id: I692f5aaa167f3acf15040d77ebb07354b71c35bd