Merge "Make lock_api available to product and vendor am: c7e7861d44 am: be4ae9f792 am: 8a55b36816 am: ea2488642e am: 1e811567d7"