Make PROVIDE_xxx macro more robust am: cd2cedc31a
am: c4f5757bd1

Change-Id: Icc52b91659f16da1d1dfdae9b7018baa1ba791ea