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

Change-Id: I3324c7b31834ab429ec3b38d4035fe3dd9e3c9b2