Merge "Make PROVIDE_xxx macro more robust" am: 243707c31e am: faaded5947
am: 5a7da217ce

Change-Id: Id76f169ce3fee253d3fcaaae4fa38d26e4fbea47