Merge "Make PROVIDE_xxx macro more robust"
am: 243707c31e

Change-Id: Idac5170061f0919a93e400fcfdfbf5a9c359c6d5