Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
am: ce3cf36652

Change-Id: I4ebe9cd31732ea45e77e6bb0a640160a90c910b0